widget-factory: Rename to org.gtk.WidgetFactory4

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f56c81e5dd2db127d447988bde2e4509da6efa00..d35315dccf64fbea0b00e085843db2f969c98aca 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,7 +60,7 @@ flatpak:demo:
 
 flatpak:widget-factory:
   variables:
-    APPID: org.gtk.WidgetFactory
+    APPID: org.gtk.WidgetFactory4
   <<: *flatpak-defaults
 
 pages:

diff --git a/build-aux/flatpak/org.gtk.WidgetFactory.json b/build-aux/flatpak/org.gtk.WidgetFactory.json
deleted file mode 100644 (file)
index 3df814a..0000000
--- a/build-aux/flatpak/org.gtk.WidgetFactory.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "app-id": "org.gtk.WidgetFactory",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-widget-factory",
-    "tags": ["devel", "development", "nightly"],
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name": "graphene",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name": "gtk",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}

diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json
new file mode 100644 (file)
index 0000000..0161809
--- /dev/null
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -0,0 +1,73 @@
+{
+    "app-id": "org.gtk.WidgetFactory4",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "gtk4-widget-factory",
+    "tags": ["devel", "development", "nightly"],
+    "desktop-file-name-prefix": "(Development) ",
+    "finish-args": [
+        "--device=dri",
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
+        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+    ],
+    "cleanup": [
+        "/include",
+        "/lib/pkgconfig", "/share/pkgconfig",
+        "/share/aclocal",
+        "/man", "/share/man", "/share/gtk-doc",
+        "*.la", ".a",
+        "/lib/girepository-1.0",
+        "/share/gir-1.0",
+        "/share/doc"
+    ],
+    "modules": [
+        {
+            "name" : "wayland",
+            "buildsystem" : "autotools",
+            "builddir" : true,
+            "config-opts" : [
+                "--disable-documentation"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/wayland-project/wayland.git"
+                }
+            ]
+        },
+        {
+            "name": "graphene",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
+                "--libdir=/app/lib",
+                "-Dtests=false",
+                "-Dbenchmarks=false"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/ebassi/graphene.git"
+                }
+            ]
+        },
+        {
+            "name": "gtk",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
+                "--libdir=/app/lib"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
+                }
+            ]
+        }
+    ]
+}

diff --git a/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg b/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg
deleted file mode 100644 (file)
index e3bccac..0000000
--- a/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.0"><defs><linearGradient id="a"><stop offset="0" stop-color="#7a1521"/><stop offset=".042" stop-color="#c01c28"/><stop offset=".083" stop-color="#7a1521"/><stop offset=".917" stop-color="#7a1521"/><stop offset=".958" stop-color="#c01c28"/><stop offset="1" stop-color="#7a1521"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#babdb6"/><stop offset=".042" stop-color="#f6f5f4"/><stop offset=".083" stop-color="#d5d3cf"/><stop offset=".917" stop-color="#deddda"/><stop offset=".958" stop-color="#f6f5f4"/><stop offset="1" stop-color="#babdb6"/></linearGradient><linearGradient xlink:href="#b" id="c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.25 0 0 .25 0 225)" x1="48" y1="44" x2="464" y2="44"/></defs><g transform="translate(0 -172)"><rect ry="8" rx="8" y="204" x="12" height="84" width="104" style="marker:none" fill="url(#c)"/><rect style="marker:none" width="104" height="100" x="12" y="184" rx="8" ry="8" fill="#f6f5f4"/><rect rx="5.345" width="92" height="26" x="18" y="-278.048" ry="5.345" transform="scale(1 -1)" fill="#3584e4"/><path d="M23.346 278.048A5.335 5.335 0 0 1 18 272.702v-2a5.335 5.335 0 0 0 5.346 5.346h81.308a5.335 5.335 0 0 0 5.346-5.346v2a5.335 5.335 0 0 1-5.346 5.346z" fill="#1a5fb4"/><rect transform="scale(1 -1)" ry="5.345" y="-245" x="19" height="24" width="90" rx="5.345" fill="#fff" stroke="#deddda" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><rect rx="5.345" width="90" height="24" x="19" y="-215" ry="5.345" transform="scale(1 -1)" fill="#fff" stroke="#deddda" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path style="marker:none" d="M99 228.948v8.23M103.167 233h-8.334M83.333 233H75" fill="#fff" stroke="#000" stroke-width="2" stroke-linecap="square" stroke-linejoin="round"/><path style="marker:none" d="M89 221.125V245M69 221.125V245" fill="#fff" stroke="#deddda" stroke-width="2" stroke-linecap="square" stroke-linejoin="round"/><path d="M24.406 222a5.335 5.335 0 0 0-5.345 5.346v2A5.335 5.335 0 0 1 24.406 224h79.276a5.335 5.335 0 0 1 5.346 5.346v-2a5.335 5.335 0 0 0-5.346-5.346zM24.406 192a5.335 5.335 0 0 0-5.345 5.346v2A5.335 5.335 0 0 1 24.406 194h79.276a5.335 5.335 0 0 1 5.346 5.346v-2a5.335 5.335 0 0 0-5.346-5.346z" opacity=".3" fill="#deddda"/><path style="marker:none" d="M95.106 201.846l3.8 3.8 3.934-3.933" fill="none" stroke="#000" stroke-width="2" stroke-linecap="square" stroke-linejoin="round"/><path style="marker:none" fill="#deddda" d="M26.02 228h36.583v10H26.02zM26 197.974h59.979V208H26z"/><path style="marker:none" fill="#98c1f1" d="M44 260h36v8H44z"/></g></svg>
\ No newline at end of file

diff --git a/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory4.svg b/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory4.svg
new file mode 100644 (file)
index 0000000..e3bccac
--- /dev/null
+++ b/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory4.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.0"><defs><linearGradient id="a"><stop offset="0" stop-color="#7a1521"/><stop offset=".042" stop-color="#c01c28"/><stop offset=".083" stop-color="#7a1521"/><stop offset=".917" stop-color="#7a1521"/><stop offset=".958" stop-color="#c01c28"/><stop offset="1" stop-color="#7a1521"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#babdb6"/><stop offset=".042" stop-color="#f6f5f4"/><stop offset=".083" stop-color="#d5d3cf"/><stop offset=".917" stop-color="#deddda"/><stop offset=".958" stop-color="#f6f5f4"/><stop offset="1" stop-color="#babdb6"/></linearGradient><linearGradient xlink:href="#b" id="c" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.25 0 0 .25 0 225)" x1="48" y1="44" x2="464" y2="44"/></defs><g transform="translate(0 -172)"><rect ry="8" rx="8" y="204" x="12" height="84" width="104" style="marker:none" fill="url(#c)"/><rect style="marker:none" width="104" height="100" x="12" y="184" rx="8" ry="8" fill="#f6f5f4"/><rect rx="5.345" width="92" height="26" x="18" y="-278.048" ry="5.345" transform="scale(1 -1)" fill="#3584e4"/><path d="M23.346 278.048A5.335 5.335 0 0 1 18 272.702v-2a5.335 5.335 0 0 0 5.346 5.346h81.308a5.335 5.335 0 0 0 5.346-5.346v2a5.335 5.335 0 0 1-5.346 5.346z" fill="#1a5fb4"/><rect transform="scale(1 -1)" ry="5.345" y="-245" x="19" height="24" width="90" rx="5.345" fill="#fff" stroke="#deddda" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><rect rx="5.345" width="90" height="24" x="19" y="-215" ry="5.345" transform="scale(1 -1)" fill="#fff" stroke="#deddda" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path style="marker:none" d="M99 228.948v8.23M103.167 233h-8.334M83.333 233H75" fill="#fff" stroke="#000" stroke-width="2" stroke-linecap="square" stroke-linejoin="round"/><path style="marker:none" d="M89 221.125V245M69 221.125V245" fill="#fff" stroke="#deddda" stroke-width="2" stroke-linecap="square" stroke-linejoin="round"/><path d="M24.406 222a5.335 5.335 0 0 0-5.345 5.346v2A5.335 5.335 0 0 1 24.406 224h79.276a5.335 5.335 0 0 1 5.346 5.346v-2a5.335 5.335 0 0 0-5.346-5.346zM24.406 192a5.335 5.335 0 0 0-5.345 5.346v2A5.335 5.335 0 0 1 24.406 194h79.276a5.335 5.335 0 0 1 5.346 5.346v-2a5.335 5.335 0 0 0-5.346-5.346z" opacity=".3" fill="#deddda"/><path style="marker:none" d="M95.106 201.846l3.8 3.8 3.934-3.933" fill="none" stroke="#000" stroke-width="2" stroke-linecap="square" stroke-linejoin="round"/><path style="marker:none" fill="#deddda" d="M26.02 228h36.583v10H26.02zM26 197.974h59.979V208H26z"/><path style="marker:none" fill="#98c1f1" d="M44 260h36v8H44z"/></g></svg>
\ No newline at end of file

diff --git a/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg b/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg
deleted file mode 100644 (file)
index 00b3480..0000000
--- a/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gtk3-widget-factory-symbolic.svg' height='16.03125' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.5 r10040' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <metadata id='metadata90'>
-    <rdf:RDF>
-      <cc:Work rdf:about=''>
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='15.183262' inkscape:cy='0.30876' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1375' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='16'>
-    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-203px' originy='-251.96875px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <title id='title9167'>Gnome Symbolic Icon Theme</title>
-  <defs id='defs7386'>
-    <linearGradient id='linearGradient7212' osb:paint='solid'>
-      <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
-    </linearGradient>
-  </defs>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-444.0002,35)'>
-    
-    <path inkscape:connector-curvature='0' d='m 446.21875,-34 c -0.64785,0 -1.1875,0.539653 -1.1875,1.1875 l 0,4.625 c 0,0.647847 0.53965,1.1875 1.1875,1.1875 l 11.65625,0 c 0.64785,0 1.15625,-0.539653 1.15625,-1.1875 l 0,-4.625 c 0,-0.647847 -0.5084,-1.1875 -1.15625,-1.1875 l -11.65625,0 z m 0,1 11.65625,0 c 0.11114,0 0.15625,0.07636 0.15625,0.1875 l 0,4.625 c 0,0.111144 -0.0451,0.1875 -0.15625,0.1875 l -11.65625,0 c -0.11114,0 -0.1875,-0.07636 -0.1875,-0.1875 l 0,-4.625 c 0,-0.111144 0.0764,-0.1875 0.1875,-0.1875 z' id='rect7030' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <path inkscape:connector-curvature='0' d='m 454.0002,-32 0,1 0,0.0312 1.53125,1.375 1.46875,-1.4062 0,-1 -0.75781,0 -0.73828,0.74609 L 454.77754,-32 z' id='path7800' sodipodi:nodetypes='cccccccccc' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <path inkscape:connector-curvature='0' d='m 446.21875,-26 c -0.64785,0 -1.1875,0.539653 -1.1875,1.1875 l 0,4.65625 c 0,0.647847 0.53965,1.1875 1.1875,1.1875 l 11.65625,0 c 0.64785,0 1.15625,-0.539653 1.15625,-1.1875 l 0,-4.65625 c 0,-0.647847 -0.5084,-1.1875 -1.15625,-1.1875 l -11.65625,0 z m 0,1 11.65625,0 c 0.11114,0 0.15625,0.07636 0.15625,0.1875 l 0,4.65625 c 0,0.111144 -0.0451,0.1875 -0.15625,0.1875 l -11.65625,0 c -0.11114,0 -0.1875,-0.07636 -0.1875,-0.1875 l 0,-4.65625 c 0,-0.111144 0.0764,-0.1875 0.1875,-0.1875 z' id='rect7811' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
-    <rect height='2' id='rect7813' rx='0' ry='0' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='8' x='448.00021' y='-24'/>
-    <rect height='1' id='rect7815' rx='0' ry='0' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='12.860504' x='445.53082' y='-29'/>
-    <rect height='1' id='rect7817' rx='0' ry='0' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='12.860504' x='445.53085' y='-20.96875'/>
-  </g>
-</svg>

diff --git a/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg b/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg
new file mode 100644 (file)
index 0000000..00b3480
--- /dev/null
+++ b/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gtk3-widget-factory-symbolic.svg' height='16.03125' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.5 r10040' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='15.183262' inkscape:cy='0.30876' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1375' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='16'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-203px' originy='-251.96875px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient7212' osb:paint='solid'>
+      <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+    </linearGradient>
+  </defs>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-444.0002,35)'>
+    
+    <path inkscape:connector-curvature='0' d='m 446.21875,-34 c -0.64785,0 -1.1875,0.539653 -1.1875,1.1875 l 0,4.625 c 0,0.647847 0.53965,1.1875 1.1875,1.1875 l 11.65625,0 c 0.64785,0 1.15625,-0.539653 1.15625,-1.1875 l 0,-4.625 c 0,-0.647847 -0.5084,-1.1875 -1.15625,-1.1875 l -11.65625,0 z m 0,1 11.65625,0 c 0.11114,0 0.15625,0.07636 0.15625,0.1875 l 0,4.625 c 0,0.111144 -0.0451,0.1875 -0.15625,0.1875 l -11.65625,0 c -0.11114,0 -0.1875,-0.07636 -0.1875,-0.1875 l 0,-4.625 c 0,-0.111144 0.0764,-0.1875 0.1875,-0.1875 z' id='rect7030' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 454.0002,-32 0,1 0,0.0312 1.53125,1.375 1.46875,-1.4062 0,-1 -0.75781,0 -0.73828,0.74609 L 454.77754,-32 z' id='path7800' sodipodi:nodetypes='cccccccccc' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path inkscape:connector-curvature='0' d='m 446.21875,-26 c -0.64785,0 -1.1875,0.539653 -1.1875,1.1875 l 0,4.65625 c 0,0.647847 0.53965,1.1875 1.1875,1.1875 l 11.65625,0 c 0.64785,0 1.15625,-0.539653 1.15625,-1.1875 l 0,-4.65625 c 0,-0.647847 -0.5084,-1.1875 -1.15625,-1.1875 l -11.65625,0 z m 0,1 11.65625,0 c 0.11114,0 0.15625,0.07636 0.15625,0.1875 l 0,4.65625 c 0,0.111144 -0.0451,0.1875 -0.15625,0.1875 l -11.65625,0 c -0.11114,0 -0.1875,-0.07636 -0.1875,-0.1875 l 0,-4.65625 c 0,-0.111144 0.0764,-0.1875 0.1875,-0.1875 z' id='rect7811' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <rect height='2' id='rect7813' rx='0' ry='0' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='8' x='448.00021' y='-24'/>
+    <rect height='1' id='rect7815' rx='0' ry='0' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='12.860504' x='445.53082' y='-29'/>
+    <rect height='1' id='rect7817' rx='0' ry='0' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' width='12.860504' x='445.53085' y='-20.96875'/>
+  </g>
+</svg>

diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index c1ba9ec56469c823beb6ba070d1a28d1a9c7b4c3..1c43423757f5ffcdb75bac209136e78f0a916985 100644 (file)
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -13,7 +13,7 @@ executable('gtk4-widget-factory',
            install: true)
 
 # desktop file
-install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir)
+install_data('org.gtk.WidgetFactory4.desktop', install_dir: gtk_applicationsdir)
 
 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
@@ -25,4 +25,4 @@ foreach size: ['scalable', 'symbolic']
 endforeach
 
 # appdata
-install_data('org.gtk.WidgetFactory.appdata.xml', install_dir: gtk_appdatadir)
+install_data('org.gtk.WidgetFactory4.appdata.xml', install_dir: gtk_appdatadir)

diff --git a/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml b/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
deleted file mode 100644 (file)
index 6e5a2d1..0000000
--- a/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>org.gtk.WidgetFactory.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.0+</project_license>
-  <name>GTK Widget Factory</name>
-  <summary>Program to demonstrate GTK functions</summary>
-  <description>
-    <p>
-      GTK Widget Factory is a showcase of GTK widgets. It was
-      originally created to help theme authors test their creations
-      for completeness.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-widget-factory/gtk-widget-factory1.png</image>
-      <caption>Page 1</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-widget-factory/gtk-widget-factory2.png</image>
-      <caption>Page 3</caption>
-    </screenshot>
-  </screenshots>
-  <kudos>
-    <kudo>AppMenu</kudo>
-    <kudo>HiDpiIcon</kudo>
-    <kudo>ModernToolkit</kudo>
-  </kudos>
-  <url type="homepage">https://www.gtk.org</url>
-  <translation type="gettext">gtk-4.0</translation>
-  <update_contact>matthias.clasen_at_gmail.com</update_contact>
-  <developer_name>Matthias Clasen and others</developer_name>
-  <releases>
-    <release version="3.94.0" date="2018-06-25">
-      <description>
-        <p>A new developers snapshot towards GTK 4.0.</p>
-      </description>
-    </release>
-  </releases>
-</component>

diff --git a/demos/widget-factory/org.gtk.WidgetFactory.desktop b/demos/widget-factory/org.gtk.WidgetFactory.desktop
deleted file mode 100644 (file)
index 8590e68..0000000
--- a/demos/widget-factory/org.gtk.WidgetFactory.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Widget Factory
-Comment=A showcase for GTK widgets, designed for testing themes.
-Exec=gtk4-widget-factory
-Icon=org.gtk.WidgetFactory
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

diff --git a/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml b/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml
new file mode 100644 (file)
index 0000000..0f08839
--- /dev/null
+++ b/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.gtk.WidgetFactory4.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>LGPL-2.0+</project_license>
+  <name>GTK Widget Factory</name>
+  <summary>Program to demonstrate GTK functions</summary>
+  <description>
+    <p>
+      GTK Widget Factory is a showcase of GTK widgets. It was
+      originally created to help theme authors test their creations
+      for completeness.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot>
+      <image>https://static.gnome.org/appdata/gtk4-widget-factory/gtk-widget-factory1.png</image>
+      <caption>Page 1</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://static.gnome.org/appdata/gtk4-widget-factory/gtk-widget-factory2.png</image>
+      <caption>Page 3</caption>
+    </screenshot>
+  </screenshots>
+  <kudos>
+    <kudo>AppMenu</kudo>
+    <kudo>HiDpiIcon</kudo>
+    <kudo>ModernToolkit</kudo>
+  </kudos>
+  <url type="homepage">https://www.gtk.org</url>
+  <translation type="gettext">gtk-4.0</translation>
+  <update_contact>matthias.clasen_at_gmail.com</update_contact>
+  <developer_name>Matthias Clasen and others</developer_name>
+  <releases>
+    <release version="3.94.0" date="2018-06-25">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
+  </releases>
+</component>

diff --git a/demos/widget-factory/org.gtk.WidgetFactory4.desktop b/demos/widget-factory/org.gtk.WidgetFactory4.desktop
new file mode 100644 (file)
index 0000000..c91544f
--- /dev/null
+++ b/demos/widget-factory/org.gtk.WidgetFactory4.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Widget Factory
+Comment=A showcase for GTK widgets, designed for testing themes.
+Exec=gtk4-widget-factory
+Icon=org.gtk.WidgetFactory4
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Development;GTK;
+NoDisplay=true

diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 08f9d5efb4307fc277994d4b63fcd8e7bcff827e..7a32c37610d90ff9335c20533b61df65c96b969c 100644 (file)
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -232,7 +232,7 @@ activate_about (GSimpleAction *action,
                          "website", "http://www.gtk.org",
                          "comments", "Program to demonstrate GTK themes and widgets",
                          "authors", authors,
-                         "logo-icon-name", "org.gtk.WidgetFactory",
+                         "logo-icon-name", "org.gtk.WidgetFactory4",
                          "title", "About GTK Widget Factory",
                          "system-information", s->str,
                          NULL);
@@ -1657,13 +1657,13 @@ activate (GApplication *app)
   g_type_ensure (my_text_view_get_type ());
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory/widget-factory.css");
+  gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory4/widget-factory.css");
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_USER);
   g_object_unref (provider);
 
-  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/widget-factory.ui");
+  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory4/widget-factory.ui");
   gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
   gtk_builder_add_callback_symbol (builder, "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed);
   gtk_builder_add_callback_symbol (builder, "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip);
@@ -1944,7 +1944,7 @@ main (int argc, char *argv[])
   };
   gint status;
 
-  app = gtk_application_new ("org.gtk.WidgetFactory", G_APPLICATION_NON_UNIQUE);
+  app = gtk_application_new ("org.gtk.WidgetFactory4", G_APPLICATION_NON_UNIQUE);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app),
                                    app_entries, G_N_ELEMENTS (app_entries),

diff --git a/demos/widget-factory/widget-factory.gresource.xml b/demos/widget-factory/widget-factory.gresource.xml
index 80a510f8ee378b32a8896b3cd70e00b4ad81fbaa..39d665da062e854f7674e95da1ac5ff80c4cccbe 100644 (file)
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gtk/WidgetFactory">
+  <gresource prefix="/org/gtk/WidgetFactory4">
     <file preprocess="xml-stripblanks">widget-factory.ui</file>
   </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory">
+  <gresource prefix="/org/gtk/WidgetFactory4">
     <file>widget-factory.css</file>
   </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory/gtk">
+  <gresource prefix="/org/gtk/WidgetFactory4/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>
   </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory">
+  <gresource prefix="/org/gtk/WidgetFactory4">
     <file>icons/16x16/actions/document-new.png</file>
     <file>icons/16x16/actions/document-save.png</file>
     <file>icons/16x16/actions/edit-find.png</file>

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index 8c3a7f6a50b887106976aee9158f5f72e23809ee..882a53a54853c5987c243c669956ed31e05dcd1d 100644 (file)
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1569,7 +1569,7 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="title">Logo</property>
                                             <property name="child">
                                               <object class="GtkImage" id="imageo">
-                                                <property name="icon-name">gtk3-widget-factory</property>
+                                                <property name="icon-name">org.gtk.WidgetFactory4</property>
                                                 <property name="pixel-size">256</property>
                                               </object>
                                             </property>